From 90299f2abd2cbb855448510138023eba3e1a4614 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 15 Dec 2011 16:52:22 +0000 Subject: [PATCH] oxenstored: install configuration file First though: - Move it to /etc/xen/oxenstored.conf. - Use /var/run/xenstored.pid as default pid file - Disable test-eagain "Randomly failed a transaction with EAGAIN. Used for testing Xs user". Doesn't sound fun by default... Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/ocaml/xenstored/Makefile | 2 ++ tools/ocaml/xenstored/define.ml | 2 +- tools/ocaml/xenstored/{xenstored.conf => oxenstored.conf} | 4 ++-- tools/ocaml/xenstored/xenstored.ml | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) rename tools/ocaml/xenstored/{xenstored.conf => oxenstored.conf} (91%) diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index 3a25d1d237..3302d576bb 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -52,5 +52,7 @@ bins: $(PROGRAMS) install: all $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) $(INSTALL_PROG) oxenstored $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR) + $(INSTALL_DATA) oxenstored.conf $(DESTDIR)$(XEN_CONFIG_DIR) include $(OCAML_TOPLEVEL)/Makefile.rules diff --git a/tools/ocaml/xenstored/define.ml b/tools/ocaml/xenstored/define.ml index 19a699f6ce..89a6aacc88 100644 --- a/tools/ocaml/xenstored/define.ml +++ b/tools/ocaml/xenstored/define.ml @@ -23,7 +23,7 @@ let xenstored_proc_port = "/proc/xen/xsd_port" let xs_daemon_socket = "/var/run/xenstored/socket" let xs_daemon_socket_ro = "/var/run/xenstored/socket_ro" -let default_config_dir = "/etc/xensource" +let default_config_dir = "/etc/xen" let maxwatch = ref (50) let maxtransaction = ref (20) diff --git a/tools/ocaml/xenstored/xenstored.conf b/tools/ocaml/xenstored/oxenstored.conf similarity index 91% rename from tools/ocaml/xenstored/xenstored.conf rename to tools/ocaml/xenstored/oxenstored.conf index f81c504a0c..9616d32036 100644 --- a/tools/ocaml/xenstored/xenstored.conf +++ b/tools/ocaml/xenstored/oxenstored.conf @@ -1,10 +1,10 @@ # default xenstored config # Where the pid file is stored -pid-file = /var/run/xensource/xenstored.pid +pid-file = /var/run/xenstored.pid # Randomly failed a transaction with EAGAIN. Used for testing Xs user -test-eagain = true +test-eagain = false # Activate transaction merge support merge-activate = true diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index 564dbeaddb..a86d558df7 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -71,7 +71,7 @@ let sighup_handler _ = let config_filename cf = match cf.config_file with | Some name -> name - | None -> Define.default_config_dir ^ "/xenstored.conf" + | None -> Define.default_config_dir ^ "/oxenstored.conf" let default_pidfile = "/var/run/xenstored.pid" -- 2.30.2